Upgrade coffee-rails to fix random spec failures on travis

https://github.com/jashkenas/coffeescript/issues/3829

Dominik Sander 8 年之前
父節點
當前提交
4a75ca3797
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 1 1
      Gemfile
  2. 5 5
      Gemfile.lock

+ 1 - 1
Gemfile

@@ -79,7 +79,7 @@ gem 'protected_attributes', '~>1.0.8' # This must be loaded before some other ge
79 79
 gem 'ace-rails-ap', '~> 2.0.1'
80 80
 gem 'bootstrap-kaminari-views', '~> 0.0.3'
81 81
 gem 'bundler', '>= 1.5.0'
82
-gem 'coffee-rails', '~> 4.1.0'
82
+gem 'coffee-rails', '~> 4.1.1'
83 83
 gem 'daemons', '~> 1.1.9'
84 84
 gem 'delayed_job', '~> 4.1.0'
85 85
 gem 'delayed_job_active_record', github: 'collectiveidea/delayed_job_active_record', branch: 'master'

+ 5 - 5
Gemfile.lock

@@ -144,13 +144,13 @@ GEM
144 144
     chronic (0.10.2)
145 145
     cliver (0.3.2)
146 146
     coderay (1.1.0)
147
-    coffee-rails (4.1.0)
147
+    coffee-rails (4.1.1)
148 148
       coffee-script (>= 2.2.0)
149
-      railties (>= 4.0.0, < 5.0)
150
-    coffee-script (2.3.0)
149
+      railties (>= 4.0.0, < 5.1.x)
150
+    coffee-script (2.4.1)
151 151
       coffee-script-source
152 152
       execjs
153
-    coffee-script-source (1.9.1)
153
+    coffee-script-source (1.10.0)
154 154
     colorize (0.7.7)
155 155
     concurrent-ruby (1.0.1)
156 156
     cookiejar (0.3.2)
@@ -585,7 +585,7 @@ DEPENDENCIES
585 585
   capistrano-bundler (~> 1.1.4)
586 586
   capistrano-rails (~> 1.1)
587 587
   capybara-select2
588
-  coffee-rails (~> 4.1.0)
588
+  coffee-rails (~> 4.1.1)
589 589
   coveralls
590 590
   daemons (~> 1.1.9)
591 591
   delayed_job (~> 4.1.0)